Declare GtkPrintJob.

2006-04-24  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkprintjob.h:
	Declare GtkPrintJob.

	* gtk/gtkprintunixdialog.c: (gtk_print_unix_dialog_get_settings):
	Change g_return_if_fail to g_return_val_if_fail.

diff --git a/ChangeLog b/ChangeLog
index 279837cf8805ac4500279363e63e653a644b7937..ecc5736985e5de7655b2591f7b1264c8e99604fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-24  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprintjob.h:
+       Declare GtkPrintJob.
+       
+       * gtk/gtkprintunixdialog.c: (gtk_print_unix_dialog_get_settings):
+       Change g_return_if_fail to g_return_val_if_fail.
+
 2006-04-24  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 279837cf8805ac4500279363e63e653a644b7937..ecc5736985e5de7655b2591f7b1264c8e99604fd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-04-24  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkprintjob.h:
+       Declare GtkPrintJob.
+       
+       * gtk/gtkprintunixdialog.c: (gtk_print_unix_dialog_get_settings):
+       Change g_return_if_fail to g_return_val_if_fail.
+
 2006-04-24  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 2999001249debc5e4c3589326ce95a7baf36b205..6b9cfeb0ed6e4d02f3df8fe640b0f794e72467fa 100644 (file)
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -35,6 +35,7 @@ G_BEGIN_DECLS
 #define GTK_PRINT_JOB_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJobClass))
 
 
+typedef struct _GtkPrintJob          GtkPrintJob;
 typedef struct _GtkPrintJobClass     GtkPrintJobClass;
 typedef struct _GtkPrintJobPrivate   GtkPrintJobPrivate;
 

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index e7fc660891e346d8508ca33e4791245502648eac..fd86dd8cde4001ff412f18cf145c421b6918817a 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -2523,7 +2523,7 @@ gtk_print_unix_dialog_get_settings (GtkPrintUnixDialog *dialog)
   GtkPageRange *ranges;
   int n_ranges;
 
-  g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog));
+  g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), NULL);
 
   settings = gtk_print_settings_new ();